am 0827e697: Merge "Increase cache size and low-watermark threshold, also" into honeycomb

* commit '0827e697a9965195ca12ba593332c555702aa94a':
  Increase cache size and low-watermark threshold, also