Merge "Merge "Add Secure NFC functionality" am: 3ffdb26aa8 am: c538141c6d am: 32b84ede51"