Merge "add shutdown animation" into oc-dev
am: 49ab678930

Change-Id: I4d7115924034eb882c78ca83f666021cfdf9e67a