Merge "Merge "CDD Annotatin for Section 3.8.13" into oreo-cts-dev am: 4948850962" into oreo-mr1-cts-dev
am: 4a2ece75f0

Change-Id: I5fa7c1c2cc1f6235fff386ce820380e829bb3912