Merge "Add new columns corresponding to Cellbroadcast settings screen." into mnc-dev