merge from open-source master

Change-Id: If08c1d42c870c8828b403ed322f3e93f07bb845a