[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 am: 764c206e6d am: 533ca31c93  -s ours
am: 4a18b463ab

Change-Id: Ia0b3eb95e0a8e3ed6f8abd5d9b36a081a62d9598