am 3b9255e3: am e57d8918: merge from open-source master