Merge "Fix zero length packet handling" into oc-dev am: b5e067007d
am: d93543b5c8

Change-Id: I53c651782c50610cbf86d518ab96f070e4768a75