Merge "Revert "Remove debugging statements before final ROM."" into jb-mr1-dev