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 am: 8a9eb79e am: 05884f74 am: 33a9a4b9 Change-Id: I81fc9043d4c7914bae70c5c06eeea0ffb3ff33f6