Added error check for output buffer size. am: 3f6c941de5
am: f0d2caa214

Change-Id: I6c5c4e82cde6e25d6548cf75a2c708dd1c037579