Merge change 3184 into donut

* changes:
  The '-D' option for the 'am' command appears to be optional, so reflect that in the usage.