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

Change-Id: I5f11ef2c520e418242b44db32d087656c4eb3984