Merge "Fix BasicNfcEeTest java package."