Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotation for section 3.10" into oreo-cts-dev am: a47e69baa9  -s ours" into oreo-mr1-cts-dev am: bc27f6e250  -s ours"