Update SecurePoll to master

Change-Id: If5c698d0a4a2cb1d4ce7d2e34378730801e44fda