[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev
am: 6cc6a0c703  -s ours

Change-Id: Iea8628f846981b6e607631158367c643c30dda3b