[automerger skipped] Fix Inavlid Pdu Issue mnc-dev skipped: bf6b2ee3...

[automerger skipped] Fix Inavlid Pdu Issue mnc-dev skipped: bf6b2ee3 skipped: 3e976736 skipped: 82496cba skipped: 083ff8b1 skipped: 58a14407 skipped: 024f0dee skipped: 492d873b skipped: f48e3db0 skipped: 97d8ac86 am: d641fe7f  -s ours
am: fc074ead  -s ours

Change-Id: I38c88d7f5ff0c17df5346ea37abfe618d2716152