Update SecurePoll to master

Change-Id: I5d9d6fc8ccb7cfdbfca63a98c938990a0b3391b4