Merge "Remove always-on logging."