Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev
am: a8ff361dfd

Change-Id: I35090af42c4d986cbb874f2599f0d34cfadafb43