am 4c385eed: am 021543fc: am a7eb4b74: Merge "Fix sockfd leakage in SensorService." into lmp-dev

* commit '4c385eedff1bcfed45d2ed29e9f36f3317de7692':