merge from open-source master

Change-Id: I5dbf9446b7d4409ec843ee800c82ec06bda7c8db