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

Change-Id: I05a6a8899f3c974934ab8929642fc17f4131dacc