Merge "Merge "Rename carrier messaging API constant." into nyc-dev am: f7375b46ff am: e6c6ca417d am: 54b280ba66"