am 7450c02a: am 900b6157: merge from open-source master