Added error check for output buffer size. am: 3f6c941d am: f0d2caa2 am: 9a6312ec am: 83c397d1 am: 462316f8 am: 564bdc76 am: 3aa85a9c Change-Id: Ie4e79f564d9c4583c437c42dc9063751ca7fcf03