Update SecurePoll to master

Change-Id: I453dc59b63f4f8725cbcabe4e47a0422630cffde