merge from open-source master

Change-Id: I333595755ed96c753b3f01ef6715a230eee94e0d