Setting Search-build fix

Change-Id: I24440654f95542dfe00a1f4e1f66a61eda83f6e5