am: 0c1c16d6 * commit '0c1c16d6': Fix portrait-orientation assumptions Change-Id: Ia8fc71515466fab079641c0fdb5828ee5cd8cb83