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

* commit 'a7368087d6f1f2682174139d9cacab48dc7bc198':