am 40090708: am 4547e528: merge from open-source master