Merge "Fixed a bug where groups would animate the wrong way" into nyc-mr1-dev...
Merge "Fixed a bug where groups would animate the wrong way" into nyc-mr1-dev am: 7120a476 am: efd8d829
am: 16ed9b4a
Change-Id: Ib2e8686d936c7ccdf76e1cda641a4c78bfb5281c