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

Change-Id: Ifeb946b66bef8807d03f2d5948ee8442d79eeb43