Merge "Fixing rotation issues." into oc-dev
am: 435da2c435

Change-Id: I618887e1760e7fffcc418fc9c137a925b480dd3f