Merge "Show search results when query string contains trailing space"
am: 8eb0c24e5a

Change-Id: Ic0382e8b3ce65b52ae2d77987ff4a79945fddb4f