merge from open-source master

Change-Id: I526915e374c6a6c34503f2b289b7b76ccceccbeb