Merge "DO NOT MERGE: CDD Annotations for Section 5.1.5" into oreo-cts-dev