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

Change-Id: I250cc44ea08498ef751c3f9cf370b09b7cd0e39f