Changes necessary for proper Nfc on AOSP