Updating MWSearch to master

Change-Id: Ifacb7bbe5a7b38ac1aa7323eb269ec4091ff4a1a