Merge "Support Signal strength offset" am: 98d499877f am: a98cefc55c
am: 51b64c7c0a  -s ours

Change-Id: Ief288382a03c12fb1ea133a53cc9a2215eaab729