Merge "Allow max aspect ratio to be specified by meta-data tag." into oc-dr1-dev am: a926dbf5d2
am: d0bc21efd5

Change-Id: Idf2bfb1d6c2b70a53ebe46df300be6fe3fce3258