Merge "Add debug for b/7094175." into jb-mr1-dev