Merge "Carry over bugfixes from MediaProvider." into rvc-dev am: f6f2273cb0 am: 60b5082204

Change-Id: Ie004dce57e8158ff09b8279ea8ea3f76b2ba688f