am 32de26bb: am c8652199: merge from open-source master