Fix portrait-orientation assumptions am: 3855bb499f * commit '3855bb499fbfc073771fa951babfe1922d90ffc9': Fix portrait-orientation assumptions Change-Id: Iadd126e2d0fc383e17234e9363cb2fc6d8c79380