[automerger] [DO NOT MERGE] Updating security string for nyc-dev to 2018-05-01 bug: 74345861 am: 7c0f23dce5 am: 21f45f7edc am: 5a2c0096d5

Change-Id: If3c74fdc2e91e9fbda025a98d284d985511de428