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

Change-Id: Id1e40a9395f922b3126d600f1072ed58038aa858