Merge "improve test coverage for CellBroadcastService" into rvc-dev