Merge "Revert "Add additional context to MtpDatabase"" into pi-dev am: 02a005703a
am: 66cb4826ef

Change-Id: I2f4a5c41e9c1a4bb22df77989c27467eca518c4b