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

* commit '85b25ee8ce0c5d19b53963c985869100282b55d1':

Change-Id: I042a2f7ad846337f06a6458002045dbe2899b98a