Update SecurePoll to master

Change-Id: I7f431431872903d06f257e0e7512891fd369ef7e