Merge "Check buffer size after read" into qt-dev
am: 9c5c5a0dfb

Change-Id: I486ad8212efa910dc7c6b4a752d7df3d237f7a58