Merge "Run the animators together" into nyc-dev am: 4a978d3d3c
am: 7d965a4c0e

* commit '7d965a4c0e29a764039a13c9eb125b483291dd50':
  Run the animators together

Change-Id: I8c3ddf9f41e97f7933f42b76ea18bcc563579da8