Update SecurePoll to master

Change-Id: I5ccd6c93dafd17b865a6b932889ba6917d13a017