merge from open-source master

Change-Id: I6bdeeff30be1fdb0901aec9bcdd67176c29eaf7b