Merge from open-source master

Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338