am cf28b803: am ae4e1455: merge from open-source master