Merge "Merge "[automerger skipped] Merge "DO NOT MERGE :CDD Annotation for section 3.8.6" into oreo-mr1-cts-dev am: d3a0c015fb -s ours am: 707f62bc93 -s ours am skip reason: subject contains skip directive"