am 3dcb1f7a: am c043a97c: merge from open-source master