Merge changes from topic "am-ddd6c5a0-3aa8-4d6c-a3b8-0460c103683f" into nyc-dr1-dev

* changes:
  [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd
  [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847