[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703 -s ours am: bf6ddb73d4 -s ours am: 80abafd713
am: 518da1c897 -s ours
Change-Id: I737ff1f97cb5c2db810b29c988000eb61af89fbd
This commit is contained in: