Fix perf regression from scale/density mismatch

 Bug: 7242941

Change-Id: I8a45e8ae589cecc6215566b995003b9eefb7827e
3 files changed