Merge "Run the animators together" into nyc-dev am: 4a978d3d3c
am: 170c83408d

* commit '170c83408d301490c278ca655acd8ddf9c55936f':

Change-Id: I0061c3027f6a2de848e38dbd3b6f30f04e2800ef