merge from open-source master

Change-Id: Iaa0381128dbfcbb6b7c7da072f0d78f02357fca9