Merge "Prevent double tap on suggestions" into nyc-mr1-dev am: d8435d57d2
am: c94ac39096

Change-Id: I25635d1153694924fdd025b31185c9ac4ffdcff8