Merge "Merge "Change contents animations" into nyc-dev am: 2bb3dd8632 am: dd5eea667f" into nyc-mr1-dev-plus-aosp
am: 6c9143cff2

* commit '6c9143cff2d85255a5c74b1a518539f012da4f44':

Change-Id: I857ba815b1781a9cbc30d136c8ed640726ece6c2