Merge "Docs: Restructure Section 5.8" into oc-dev
am: 0307221147

Change-Id: Ib3b6535c4050367f10e18b1866ff9b5b46f7d9cf