merge from open-source master

Change-Id: I29602fecafc2b6d93b849ada89696a67cfd23353