am 38a410f1: am 686d9ff5: merge from open-source master