Update SecurePoll to master

Change-Id: I688333a646e7f1c9d026a5d11f4faeb10053fbb7