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

Change-Id: I147ea24394239b1161199801085680febc3daa84