Merge "Search results always highlight proper results" into oc-dev am: 2a32cb6a33
am: d07e14fb5b
am: e844588e0e
Change-Id: I25ec3fe7798ec88fa91028914e11ee519ef74662
This commit is contained in: