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

Change-Id: I81d36d626fb8f30edc1ab7b1f7b42495a50bf79f
tree: 032cbcdf0dd85b1018333669ef4029ed32955c5c
  1. tests/