Merge "Fix portrait-orientation assumptions am: 3855bb49 am: dbe726e3" into nyc-mr1-dev-plus-aosp am: 7644c106 * commit '7644c106': Fix portrait-orientation assumptions Change-Id: I238d669cd158c60ce5e504b29cb69b1b0b45bdfb