[DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cdc4 am: 3ce29b8a94
am: b0cef41b76  -s ours

Change-Id: Ia5ab2a5e1fb3a168a28b039de6ba1028352b09d1