Merge commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf' * commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf': Fixed NdefTag parcelable conversion methods.
Merge commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf' * commit '4c8fda62e1bf21318d22f4b85aaa1c729da976cf': Fixed NdefTag parcelable conversion methods.