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