Updating MWSearch to master

Change-Id: I9e0ea0fa0463f71c1c8c7b4112a3205d1fd47bea