[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4
am: 3ce29b8a94

Change-Id: Ib13337116f814cb65ef48f44fc1215658314276b