[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 am: d641fe7fec  -s ours
am: fc074eadf1  -s ours

Change-Id: I38c88d7f5ff0c17df5346ea37abfe618d2716152