Merge "Merge "[automerger skipped] Merge "DO NOT MERGE:CDD Annotations for Sensors" into oreo-mr1-cts-dev am: 18d18b7ac3  -s ours" into pie-cts-dev am: 774ab84063  -s ours" am: 31d801d868  -s ours
am: ded10fb3ab  -s ours

Change-Id: Ia460ad61598844ee74e1c6440588b9ad12b3c59b