Merge "Log excessive boot times"