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

* commit '4a978d3d3c1163179ca7b387abcaf572a9a14889':
  Run the animators together

Change-Id: I5e56a35286f88712fff215f9bde8ba5206ec3670