Merge "Backports implementation for AltitudeService to T."