4.3 broken nfc (?)

Change-Id: I0c0f25df1b90667b383071fe06c1d0e90d335e07
Merge remote-tracking branch 'pa/jb43' into jb43