Merge "Fix zero length packet handling" into oc-dev