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

Change-Id: I67eb1d6f715ea60ab5126fe4025c05383d4ec326