[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

Change-Id: Ie35c57a24abb4638ac3372d42913d3e4cad5410a