Merge "Do not update matches string when there are no matches." into honeycomb