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 am: b728daee Change-Id: Ice235bf414e839467a3703247291e3b77c8058dd