Pass phpcs-strict on includes/search/

Change-Id: Ia38af607b1f2a8e49f60f1a659a14b801e7dcda0
Merge "Pass phpcs-strict on includes/search/"