am d350cf1b: am ca81fb41: merge from open-source master