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

Change-Id: I0e0dcfe8c5cf366a27d64d460328b99be184fcc5