Merge "Add Secure NFC functionality"
am: 3ffdb26aa8

Change-Id: Ic3131f8763d0e04e50a81652f6b0e08e48bd0f1e