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

Change-Id: Ib40540ba03d30e40a316c20f35fd8dec249e8589