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

Change-Id: I10d4479c79c1997325f74477a94e4f74eb043f46