Merge "Backport implementation of AltitudeConverter to T."