Merge "Added ETWS primary message default message support" am: 2d3fb48b39
am: dfe1743b37

Change-Id: I71a1be66cb84ed8030df4ab9d406c390872f5346