
In the general validate_metric case, when possible add the metric name to the exception message. This makes it much easier to track down what metric failed. Also, fixing code where an exception could be thrown but then immediately ignored and another exception fo the same type with a different message would be thrown. Change-Id: I8b8f04bb98a65b6904894dc00af88ea367a350f8 Story: 2004185 Task: 27675