Merge "Adding Error Check for Output Buffer Size" into mnc-dev am: 3f4f2652 am: 385836df am: 6357821b am: bab1b91a am: d4795658 am: 27b272fe am: b6a6c5f7 am: 30c43b20 Change-Id: I0870430a4b7c10065e6ea76314b448455494e523