Merge "Put debug back in for b/b8263462." into jb-mr2-dev