Another SecurePoll backport

Change-Id: Ie919526be97c8c21d2195ebea03960576ba74182