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

Change-Id: I35883ffb6ff260bd101578333b9543621903e40c