Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev am: 4173c4fce5  -s ours" into pie-cts-dev
am: 7b1734a9b4  -s ours

Change-Id: Ibefdc0e48c621fd96dd0cace3ee514efa426c714