Fix search highlighting

Bug: 10713067
Change-Id: I6fd3e6018619d61f7c69bbcaf2ad7475b20499a6
3 files changed