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

Change-Id: I5584032204bdd67a43b01e3fb273af55092d18d5