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

Change-Id: I067fb649c9a81a499a3d9788c714be7a7052a863