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

Change-Id: Id1667df7f50096619e7207d42a0212139eab7758