Merge "Remove duplicate MediaStore class" into rvc-dev am: 776c21cbc3 am: 47fae0e567 am: a5ee57b723 am: c1a6d839f1

Change-Id: Id549c95d7a4587fd110a44a2270d0a5f19024c18