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

Change-Id: I3f1dd4938ed37af093d326a951b9eb1854e60611