Merge "Remove duplicate MediaStore class" into rvc-dev am: 776c21cbc3

Change-Id: I29abb7b3b6890c246128b288b544a259b10605b6