Merge "Merge "CDD Annotation for section 3.16" into oreo-cts-dev am: d428e2b437" into oreo-mr1-cts-dev