Merge "Merge "CDD Annotatin for Section 3.8.13" into oreo-cts-dev am: 4948850962" into oreo-mr1-cts-dev