Merge "Add support for new SMS metrics"