Updating MWSearch to master

Change-Id: I4e1c50c80c9281f0712fed2722752e0018b0a4da