Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for section 5.2/5.3" into oreo-cts-dev am: acc9a3ed37  -s ours" into oreo-mr1-cts-dev