Merge "[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for 7.1.3/3.8.7" into oreo-mr1-cts-dev am: bdc2ae8a03  -s ours"