am 860728a3: am e5ab92a2: am cf6ab741: merge from open-source master