Added error check for output buffer size. am: 3f6c941de5 am: f0d2caa214 am: 9a6312ec9f am: 83c397d1ab am: 462316f8d2 am: 564bdc7609
am: 3aa85a9cc5

Change-Id: Ie4e79f564d9c4583c437c42dc9063751ca7fcf03