Merge "Fixes a NPE in search manager in CTS tests." into pi-dev