Merge "Merge "Changing the way the media image scales" into oc-dr1-dev am: e06e3f97fc am: d0644e4493" into oc-mr1-dev-plus-aosp