Merge "Fix argument type in MtpDatabase#getObjectPropertyValue." into nyc-dev