Another SecurePoll backport

Change-Id: Ibd8ae3e64732425f3b2f90bfa5a7749d641d80de