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

Change-Id: Idcb0514e5e5dca5f09c222632ee23112d20560dc