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 am: 3ded290e7d am: 2996209f6f am: b6279913b3  -s ours am: 8d6607c91e am: b9a68b56fc am: acb61d098f am: 7e925268af
am: fa06ff812b

Change-Id: I9836ac759949c80368c83cfc48993dcfaa665e6d