Merge "Use a separate heap size to receive buffer" into oc-dev
am: ca0b8ccfc5

Change-Id: I7d4b6c6f6103d19d0ae12b9850eca33d4d956411