merge from open-source master

Change-Id: If5c0de38e4b859b471abcecf16b5511c405bdcef