Merge "Do not log boot times for secondary users and upgrades"