am e3db3d62: Merge commit \'525f953b\' into manualmerge

* commit 'e3db3d6209c234e032775079a1e1489478dabf86':
  Make the new NFC APIs public.