Merge "Added ETWS primary message default message support"