am c50c6651: Merge "More memory!" into honeycomb

* commit 'c50c6651d388fada4c693d92f0e3bc93943262db':
  More memory!