Merge "Fixes a NPE in search manager in slice CTS tests." into pi-dev
am: d0545395df

Change-Id: I5411ba9cacf0fa4f9308f83d00677a23a95155da