am 6d2a18b5: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1

* commit '6d2a18b51ee7f7f3aad0b7b76ab55a90900f9403':
  docs: updates to OBB guide for naming; plus other edits