merge from open-source master

Change-Id: I5780767c96fbc775ce0dbbcfddb0c2e84bbfaf41