Merge "Added CMAS/ETWS duplicate expiration support"