Merge "Docs: Restructure section 9.7." into oc-dev am: 0517581350
am: 799b24d0ae

Change-Id: I2f1d3af8506f1b82c810dee46f29094299aef7fe