Merge "Heap-buffer-overflow in nfc_data_event" into rvc-qpr-dev