[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94 am: b0cef41b76  -s ours am: 8f86884a97  -s ours am: c901cec8b2 am: a150db6547  -s ours am: 28ecd6fdd5
am: 58300f46bf

Change-Id: If3f378886a2a36d0af478f6a44d8db64e83832a8