[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d69559 am: 97c071f5ae am: 61c5e5075c  -s ours am: 074c3265aa  -s ours am: 2e9eb28b99 am: fef824f53d  -s ours
am: e5d862ad75

Change-Id: Ib3083a0d30e4567a39d6a51a97cae86ab502a2f0