Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad am: 645f200ae8
am: 2cd2a76c64  -s ours

* commit '2cd2a76c64dead0b057b7e9a1223f67f9a9d2e7f':
  Update Security String to 2016-01-01 - DO NOT MERGE