merge from open-source master

Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3