merge from open-source master

Change-Id: I24ecfac151c0ddc27237d711c95b8fe488d7931b