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

Change-Id: Ieb08ea8367b3398926c45170d39ae00b962d5731