Merge "Rename carrier messaging API constant." into nyc-dev