Merge "Revert "Add device document to MtpDatabase.""