Merge "Fix the return type of getFrequencyOffsetMetersPerSecond" into sc-dev