Merge "Revert "DO NOT MERGE: CDD annotations for section 3.2.3.1 and 3.6"" into oreo-mr1-cts-dev