[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

Change-Id: I46d21630e67552086c193d65d78d86e8b96872d1