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

Change-Id: I50d425d04ba922293f6cb6a8003af8ca46dc03d4