Merge "Sensors HAL changes"