merge from open-source master

Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c