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

Change-Id: I8552740fbb7b53044e0c9fb47ac2721129b1219d