merge from open-source master

Change-Id: I9363020bdd32d8ff984a3945a2aab6245cf7a3c4