Merge "Merge "Demote STEP_CLOCK_ANIMATION from Droidfood to Teamfood" into tm-qpr-dev am: f7a8c8cc am: 8cbf51b1" into udc-dev