Merge "Adding BT dependency for CellBroadcast"