Merge "[DO NOT MERGE] Update Security String to 2018-01-01 Bug: 69257226" into nyc-dev am: 5b0a42789a
am: 3fea140429

Change-Id: I25d21d5613829b527d8c8d9e986c2ae3d74cde17