Merge "Docs: Restructure CDD section 8.5." into oc-dev am: bae4931b7a
am: cddb0bbbfe

Change-Id: Ife905dc47eca3c2a6e15b56e4045a9e6be4631ff