DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d085095...

DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d085095 am: f19c200a am: 4826d7e4  -s ours am: 1b9f1e81  -s ours am: b3b5777f am: bff6f7d9  -s ours am: b65c93db am: 3ded290e am: 2996209f am: b6279913  -s ours am: 8d6607c9 am: b9a68b56 am: acb61d09 am: 7e925268 am: fa06ff81
am: 3d9fad51  -s ours

Change-Id: I19fd09d46570107bf4cbd0599881a4464b85880d