Merge "Added tron metrics for shutdown time" into oc-mr1-dev am: 30c565d399
am: 8908b418ee

Change-Id: I6eb5c2270b636880ccdd840703bff6925a2b39d3