Update SecurePoll to master

Change-Id: Iae28629ada99243a255ecbd339d6d3abc5a83295