84c50c9878
Also do a sneaky update to switch from dict() to list() Change-Id: I71b65b82e8609fc4b3b48ef58acdf434ce69fe5c