Merge "Do not report uptime to tron after runtime restart"