Merge "Remove debugging for b6829431." into jb-mr1-dev