Merge "Fix portrait-orientation assumptions am: 3855bb49 am: dbe726e3" into nyc-mr1-dev-plus-aosp
mentioned in commit 5b5c25ac