merge from open-source master

Change-Id: I076e0df8656fdf58c229cc9a168cd6d8e16b6d8e