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 am: b3b5777fff am: bff6f7d991  -s ours
am: b65c93dbcf

Change-Id: I64613daf3496d52137f8bb51b0624d05590a308b