Merge "[automerger skipped] Merge "DO NOT MERGE: CDD annotations" into oreo-mr1-cts-dev am: eccc8107d7  -s ours" into pie-cts-dev
am: aaa04138a3  -s ours

Change-Id: I53c46efece7979636875cee05a63f61fee41f243