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

Change-Id: I21fc704c5cd159a11352d34d41f7a72017eb748b