Merge "Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am: ebb6e998d5 am: 44442c4c99" into oc-dr1-dev-plus-aosp