Merge "DO NOT MERGE: CDD Annotations for 5.1.4" into oreo-mr1-cts-dev