Merge "Backports interface for AltitudeService to T."