DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467 am: 7b35a39690 am: 645af9a302  -s ours am: 5e0c5f0263  -s ours am: 8edd5d7e30 am: 5af5f2c46f  -s ours am: e1d7ca1ec7 am: 35c6a6d4a3 am: 099df1bb0d am: c1d127aa41  -s ours am: 635c2bd638 am: 0dd56e764d am: ef22893c43 am: 676aefaa81
am: f310a0424a

Change-Id: I0e1a5a9c68055cec93076cdb83174aae8acb13f5