am e14c0f63: am 3fe4027f: Merge "Enhance diagnostic options."

* commit 'e14c0f637ced7ae93a907abe93c6c19f376025ff':
  Enhance diagnostic options.