am 0ca99ec2: am fe134127: merge from open-source master