Merge changes from topic "presubmit-am-cd43ef0f36a94448b831963bcc793ef7"

* changes:
  [automerge] Add Diagnostics Oid in HAL. 2p: d5796d6576
  Add Diagnostics Oid in HAL.