merge from open-source master

Change-Id: I4e06b684dd46c317e1c206e584050dbee20be281