Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056 am: 7e5936e666 am: 81341d9c16 am: 5a62595e8e am: a2c05e0318
am: 04a45728f2  -s ours

Change-Id: I10352f5bd8621059ffc97156115adbac27625fbc