merge from open-source master

Change-Id: I7f30144c12c340501f161fba70a917eb62afc41f