Merge \"Update AssistDisclosure animation\" into nyc-mr1-dev
am: 16541c60ad

Change-Id: I7ac13b511d5b32bf6041626035b1bb249a4aa0d0