Merge "[DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847" into nyc-dev