Update SecurePoll to master

Change-Id: I0ca66ac5982377d272a410b70bfb20f0de619ff7