Merge "Fix portrait-orientation assumptions am: 3855bb49 am: 0c1c16d6" into nyc-mr1-dev-plus-aosp
mentioned in commit 773266c0