Merge "Docs: Restructure section 8.4." into oc-dev am: bdb67796fc
am: 70296e15d2

Change-Id: I0e6e26f52d1d7ec04bcabce5e726122470b2a96b