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

Change-Id: I01783d4c6832c2a7a1a92c89457e8b6644a71258