Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
am: ebb6e998d5

Change-Id: I8973b62b103f4f40275bc5681f54b5957385ecb1