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

Change-Id: I714abae0311042314d670a6ba8fc14548fea52ce