Merge "Don't treat failed scans as valid media files" into pi-dev am: e4dc997cf6
am: fdfeece6f9

Change-Id: I59e7877ac1da0b4c0f8ce13ecfd291d6e6ed4863