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

Change-Id: I9757d3ee82598276e9fd5b5484435d6699c8c8e3