Merge "Limit buffer size to 16MB on fugu."
am: c8a54ff222

Change-Id: I7a0a8a2267cf4ea1a5201583b23d0848359bc257