merge from open-source master - DO NOT MERGE

Change-Id: I52a12f84d69726d353c87c1b150af205ba22f460