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