merge from open-source master

Change-Id: I71f2e47509695ba9ec626f4a6917a645b00a4e70