Merge "Fix CarrierSignalAgent Unit test failure"