Update SecurePoll to master

Change-Id: I39a5e212b90b2e6b3d141142ae0b574060a06c4d