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

Change-Id: I9f09f136a764aee7fd98ac7ad49d571927e693be