Merge changes from topic "am-6cd16741-fe97-4073-b960-1f6c6f29d01d" into nyc-mr1-dev

* changes:
  [automerger] Add test for bug 62187433 am: 92e3d76683 am: af86a9c7f5 am: 40a3b6b2c6 am: 8155b2a38e am: 534d916230 am: 33e8562621 am: 0a2b968c22 am: 5cb8f5b964 am: a1335a4b9c am: be4aa19e85 am: acfcf66126 am: 5f9e74c8c4
  [automerger] Add test for bug 62187433 am: 92e3d76683 am: af86a9c7f5 am: 40a3b6b2c6 am: 8155b2a38e am: 534d916230 am: 33e8562621 am: 0a2b968c22 am: 5cb8f5b964 am: a1335a4b9c am: be4aa19e85 am: acfcf66126
  [automerger] Add test for bug 62187433 am: 92e3d76683 am: af86a9c7f5 am: 40a3b6b2c6 am: 8155b2a38e am: 534d916230 am: 33e8562621 am: 0a2b968c22 am: 5cb8f5b964 am: a1335a4b9c am: be4aa19e85
  [automerger] Add test for bug 62187433 am: 92e3d76683 am: af86a9c7f5 am: 40a3b6b2c6 am: 8155b2a38e am: 534d916230 am: 33e8562621 am: 0a2b968c22 am: 5cb8f5b964 am: a1335a4b9c
  [automerger] Add test for bug 62187433 am: 92e3d76683 am: af86a9c7f5 am: 40a3b6b2c6 am: 8155b2a38e am: 534d916230 am: 33e8562621 am: 0a2b968c22 am: 5cb8f5b964
  [automerger] Add test for bug 62187433 am: 92e3d76683 am: af86a9c7f5 am: 40a3b6b2c6 am: 8155b2a38e am: 534d916230 am: 33e8562621 am: 0a2b968c22
  [automerger] Add test for bug 62187433 am: 92e3d76683 am: af86a9c7f5 am: 40a3b6b2c6 am: 8155b2a38e am: 534d916230 am: 33e8562621
  [automerger] Add test for bug 62187433 am: 92e3d76683 am: af86a9c7f5 am: 40a3b6b2c6 am: 8155b2a38e am: 534d916230
  [automerger] Add test for bug 62187433 am: 92e3d76683 am: af86a9c7f5 am: 40a3b6b2c6 am: 8155b2a38e
  [automerger] Add test for bug 62187433 am: 92e3d76683 am: af86a9c7f5 am: 40a3b6b2c6
  [automerger] Add test for bug 62187433 am: 92e3d76683 am: af86a9c7f5
  [automerger] Add test for bug 62187433 am: 92e3d76683
  Add test for bug 62187433