Update SecurePoll to master

Change-Id: Icc60c70c8d7adee8b14b92fef508afab06a17358