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