Merge changes from topic "presubmit-am-9fc4701cfe15424888eb39099ee931e5"

* changes:
  [automerge] Add new capability TLV and config TLV for supported diagnostics. 2p: 6d25b825e8
  Add new capability TLV and config TLV for supported diagnostics.