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

Change-Id: I8f125b899dc80928ab884376f0bcf26908845d53