Re-add change to support empty NDEF Messages