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

* commit '4f9bb17f7e74746c4296100f2fbd47f0f6ead3a7':
  Improve compat mode scaling implementation.