[automerger skipped] Fix Inavlid Pdu Issue mnc-dev skipped: bf6b2ee30c skipped: 3e976736c6 skipped: 82496cba2c skipped: 083ff8b132 skipped: 58a14407d9 skipped: 024f0dee77

Change-Id: I410145fd722ee1270184f728b686d12a44ae14c5