merge from open-source master

Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c