Merge "Properly check for orientation mismatch" into oc-dev
am: a96d749140

Change-Id: I2476d7710bff82e3eeedc0f48f61b57e392efbe7