Merge "[framework] Fixed signal strength issue" am: 6d98743048 am: c671962c9a
am: af9207272a

Change-Id: I86d83b0b51a5a9b73ddd181f4962ac1b9647bb1c