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

Change-Id: I8e78cbf8718a7e0665a367cd90333f6dcaf6de55