jf: signal strength fixes

Change-Id: I3a07ac5157db9c64bca1016ab137419968c16fe6
Merge remote-tracking branch 'cm/cm-10.1' into jb-mr1