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

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