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

Change-Id: I1f742419b6f25d74a8b2d895155796f0e718da59