am 385d0519: am b16a6d6e: Merge "DO NOT MERGE Fix rotation and memory use bugs" into honeycomb-mr2

* commit '385d051933da07e3c7f81aac263e9f4f23d716f6':
  DO NOT MERGE Fix rotation and memory use bugs