Merge "Fix 256-bit Thinfilm NFC barcode." am: ce926cf46d am: dacb0c215d am: 12807b8e5a
am: c9176d3e2c

Change-Id: If9afaac0b301cb05acc4e35ca426a120a2152346