Merge "Changing the way the media image scales" into oc-dr1-dev am: e06e3f97fc
am: 49cdbaa25f

Change-Id: Ie282d7a84ec75de60d507b3f88c1eea614e6fb41