Merge "Fixed the incorrect downlinkOffset and uplinkOffset values"