Bug: 241295640 Test: tested with opt-in suggest data. Change-Id: I424525eed93c60e77566bcaf673f9f1ff61e1fa1