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