Merge "Don't diverge from upstream on a debug print"