merge from open-source master

Change-Id: I1fd774738c01a2cdffac0d455c63d574131e6fb8