merge from open-source master

Change-Id: I5d19eb677dcfc7b73919d659fafb29fb85dc7f47