[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 am: d466175346 am: bc19d8140c  -s ours am: 53a64664c9 am: caff84dcbe
am: 2f222829e0

Change-Id: Ia195157ac55b1bfa35c206614a813f3e1585134f