Merge "Limit buffer size to 16MB on fugu."