Merge "Merge "Docs: Restructure section 9.11" into oc-dev am: b9dd68f4a0 am: 7e8135e2e1 am: 3cc9e94d6d" into oc-mr1-dev-plus-aosp