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

Change-Id: I872c7ff88088a3f7417aa5a1afec4856b21a8803