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

Change-Id: I31f6da168347a6421d9bbb12287814dc597170f7