Added CMAS/ETWS duplicate expiration support am: f8247928a2
am: 4461e96abb

Change-Id: I7a7e85f88e05f1dec1c83a9b41138534afc02269