merge from open-source master

Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9