Merge from open-source master

Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39