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

Change-Id: Ibd1d52b9ca00b9edd34f0b37b11a4d37d6573543