am e23c404a: am bea97a89: am 2dc7c6c4: merge from open-source master