Merge "Docs: Restructured section 9.5." into oc-dev
am: c2367af9e6

Change-Id: I592db56f0e4210a7402ed7827004f59723a93085