Merge "Revert part of fix for b/7377776 to fix b/7411356." into jb-mr1-dev