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

Change-Id: I331309462e31dbe894dc9351ef03fc3276833a54