Update SecurePoll to master

Change-Id: I4186d1a49a42e28cf1205394bf09bbab4c2557cf