Merge "AOD animation polish" into pi-dev
am: 704a0d6174

Change-Id: Ia5662e819573ba45707f4f2dd4f166c64d87154e