am c491fdc6: am 6be163b1: merge from open-source master