am c2db2144: am a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2

* commit 'c2db21445ddd4327e949b38edcf1ab9fd18f94f0':
  Improve compat mode scaling implementation.