am 35b11843: am 1f35de2a: am 79090cb3: merge from open-source master