[DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb31 am: 5be6d3bbb4
am: ed38784898  -s ours

Change-Id: I1dac91eb4bcc2811d64193ee684735d3b3430900