[automerger skipped] Merge "Adding NCI packet length check" into qt-qpr1-dev am: 7fb4b2916c -s ours am skip reason: Change-Id Ic7fa94f8d48024db204e84aed443ee65d7d6c900 with SHA-1 9b48eb3865 is in history Change-Id: I2808715c28f29a171f0090112cab6317ca171ac6