Update SecurePoll to master

Change-Id: I08e3ba67f285a4be78386d03f97a11b3510227bf