Updating MWSearch to master

Change-Id: I20818b72ceef5bd0c040c17484b51b0fe8bf1a35