Merge "Support Signal strength offset"