Merge "Docs: Restructure Chapter 7.1" into oc-dev am: 1c94e55f6c
am: 474bb88c42

Change-Id: I4268557ebd4654ddfdafb7381e095d3dc74fd7b6