Merge "Fix portrait-orientation assumptions am: 3855bb49 am: 0c1c16d6" into nyc-mr1-dev-plus-aosp am: 85b25ee8 * commit '85b25ee8': Change-Id: I042a2f7ad846337f06a6458002045dbe2899b98a