Merge "Extend the metrics for resume on reboot"