Merge "Fix rotation animation selection." into oc-dev
am: e8d7c01e8a

Change-Id: Ife07062b479b5cffc6e56a8d46d545c22caf8198