Merge "Add support for larger aspect ratio"
am: 40c123ea89

Change-Id: I7f9f9bc04fe0a0b278c5380093fd625fc5387519