Merge "Support Signal strength offset" am: 98d499877f
am: a98cefc55c

Change-Id: Ib545af88fb521465f4b2b410c7eab0c9d20dd317