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

Change-Id: I2be60e2d523009d4a0231415f830de3e5550e6b2