Merge "Docs: Restructure section 9.11" into oc-dev
am: b9dd68f4a0

Change-Id: I9492a673f6817f52a9616a19e6f9fea95115bbf3