Update SecurePoll to master

Change-Id: Ie73c059ce535bfa8198c9be7d5678c8399465cf6