Updating Security String to 2017-01-01 am: a0985a838b am: 542e90b0be
am: 99abf297d8  -s ours

Change-Id: Ib9fc62c50d1d3d07fa0ad03dd93a8c88e10d5c3c