Merge "Added carrier customized ETWS test channel support"