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

Change-Id: I03e1b4ddb5315a2eae099bb85b692bf90744ba3d