merge from open-source master

Change-Id: Ib4ce8d43cb8df5e2cbeed241def07bba63278af4