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

Change-Id: I3065d74ca69f49b97dd64d015d65260671ecf158