Update SecurePoll to master

Change-Id: Ibb90cbaaf48260446572b33abe6714c02bc7095e