Merge "Docs: Restructure section 9.9." into oc-dev
am: cfd103191a

Change-Id: I4429ea8728a1827937f3f4d907a566d2379e821d