Merge "cellbroadcast API cleanup"