merge from open-source master

Change-Id: I970684d917ea2024871b45abe532c52bb45673c6