am 0e74aa0f: Fix broken Searchables unit tests.

Merge commit '0e74aa0f7ed90d46e0bdde02bf9b7b29c6b95bd8'

* commit '0e74aa0f7ed90d46e0bdde02bf9b7b29c6b95bd8':
  Fix broken Searchables unit tests.