Merge "CDD Annotatin for Section 3.8.13" into oreo-cts-dev