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

* commit '9675ed0a37cae6299e8db472743944bba24d8999':

Change-Id: I20bef1d45fb600c8027e2da6280c1cf57901507f