merge from open-source master

Change-Id: Ic4d166897b594c4d5552a2bb1a89ed368cf2b782