Merge "Update anim to spec" into pi-dev
am: c5fdecaa3b

Change-Id: I2abcc452c7e38df0fd368a864e7e5c9f77925c41