Merge "Fixes a NPE in search manager in CTS tests." into pi-dev am: 188b642ac0
am: 9ec1c3fe3a

Change-Id: I7f5a0deb21e89d8b9f66af4cd88e63056edb1373