Merge "Fix rotation animation selection." into oc-dr1-dev am: cee8098178
am: 228571391e

Change-Id: Idd2a3c23233f0758cc96a55da97b99c6ee8a7c94