DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49
am: 4826d7e492  -s ours

Change-Id: Icd9c4018e5dc1b9f7857c8d3ca427381edd1beed