merge from open-source master

Change-Id: If6730b50627b2231bd345e594d8d30a37557849e