am 93f7d42d: am 7c72a8f9: Merge "Fix perf regression from scale/density mismatch" into jb-mr1-dev

* commit '93f7d42deb07bdbbc6cc0724247d6efce1f5a3e2':
  Fix perf regression from scale/density mismatch