Merge "Adding Error Check for Output Buffer Size" into mnc-dev am: 3f4f2652 am: 385836df am: 6357821b am: bab1b91a am: d4795658 Change-Id: I7e037f1ee186331f2348f6e7d69bed7ce61b2f7d