Update MWSearch to master

Change-Id: I593a06134395bbd2e8d258474a04cc3462f7aa4d