am f8402ac0: am 253290a7: merge from open-source master