Merge "Docs: Restructure Chapter 7.7" into oc-dev
am: ef9b248b6c

Change-Id: I306f0ddfa46c15e813bdb504e0ba0012745bb15c