Merge "Add better logging to find auth errors." into jb-ub-mail-ur10