Merge "Work around buggy DMAgent." into nyc-dev
am: 5d4b11e

* commit '5d4b11ef18cd3a78fa985d953ccd366772dab037':
  Work around buggy DMAgent.