Merge "Merge "Fixed an issue where children would animate strangely when...
Merge "Merge "Fixed an issue where children would animate strangely when removed" into nyc-dev am: 35a8c2f0 am: 152de8e3" into nyc-mr1-dev-plus-aosp
am: fb2f1870
* commit 'fb2f1870':
Change-Id: I201c43d6f2b861397d71d743c9c294e9bd9632f8