Merge "Fix portrait-orientation assumptions am: 3855bb499f am: 0c1c16d651" into nyc-mr1-dev-plus-aosp