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

Change-Id: Ie1e065ba9a5ec8342794bee335ee7e1e63e415fa