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

Change-Id: Iff3964d640816e6936327119face3999df0a1bc5