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

Change-Id: If388ac77830ba2e042f2200fda82fc9c91e6ee80