Merge "Added tron metrics for shutdown time" into oc-mr1-dev