Merge "Added ETWS primary message default message support" am: 2d3fb48b39 am: dfe1743b37
am: 0f127ea929  -s ours

Change-Id: I8eef7fc8f253a647469b71328eb6d89a0210f6ff