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

Change-Id: Ia7c2c25e651a2abb901ec08ce780a94c72a912a3