Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section 5.3/C-1-1" into oreo-cts-dev am: fb0b0721 -s ours" into oreo-mr1-cts-dev am: a27c9135 -s ours Change-Id: I7d196dedb1806ff7b5c1dea83bc2ef99a007c59d