Merge "Prevent OOB read in nfa_dm_handle_message" into qt-qpr1-dev am: 87add19258

Change-Id: Ia91e0202e5401e929b15467aa32278008ee04bfe