merge from open-source master

Change-Id: I0dd123dde8f0da42a99313cffed6a48d30e38381