merge from open-source master

Change-Id: I05e4c26c902f3cfe0dd99107f518768b246562f7