Merge "Docs: Restructure section 9.6." into oc-dev am: 2a7d57049f am: 640a52f072
am: 5a85283743

Change-Id: If10e41e3da2887740dd90a39ac1e01eea9ba95de