Allow use of comma to separate search keywords, update keywords

Bug: 26149710
Change-Id: I2d8095bbb007c011d7b3e2fe077115c696f9e39c
2 files changed