Merge "Add atoms for CellBroadcastModule"