Merge "[DO NOT MERGE] Update security string to 2018-03-01 for nyc-dev Bug:71860241" into nyc-dev
am: c3aee02b03

Change-Id: I2db4d77ae94e11c304cbbe74557e5c6f42c8a6cd