am 62f30537: am c0b3ad16: merge from open-source master