Updating MWSearch to master

Change-Id: I99472617dd95f10c59cb202e14de4605d9f2785c