[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for 5.1.4" into oreo-mr1-cts-dev am: 2b8f38bf3f  -s ours
am: f776445049  -s ours

Change-Id: I7129cce535e191514f2ee21897c1072a72fa9b88