Merge "Captures metrics on disk when devices reboot and shutdown. Specifically,"