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

Change-Id: I8216dc0c59b3a54673794957c1036070d9465b20