merge from open-source master

Change-Id: Iecfd2bd3069f70bbe508042cc249fcf7ff24800d