am 4912afb1: am 2d75ee4a: merge from open-source master