Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations Section 6:" into oreo-mr1-cts-dev am: 9e167975da  -s ours" into pie-cts-dev
am: b3b8723701  -s ours

Change-Id: I3ad4e4addca389ce2012786f4be65a2483466d32