am 0b6defef: am aa2fe148: merge from open-source master