Merge "DO NOT MERGE: CDD(8.1) Annotations for section 7.4." into oreo-cts-dev