Update MWSearch to master

Change-Id: I48979c77e02e6be54b128739c3f934ea8039641b