Merge "Light grey android.media.MediaScanner.isNoMediaPath" into pi-dev am: a8527b9cb1
am: e71f772290

Change-Id: Ia7c043ad6cd371073ba02cce5f2afffc2c177161