[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am:...

[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cd am: 3ce29b8a am: b0cef41b  -s ours am: 8f86884a  -s ours am: c901cec8 am: a150db65  -s ours am: 28ecd6fd am: 58300f46 am: 764c206e am: 533ca31c  -s ours am: 4a18b463 am: 1cfaef42 am: 4fae3e67  -s ours
am: d36e497c  -s ours

Change-Id: Ia414b6695a963a6793b4c1aad7fc84ade463d894