Merge "Update protected broadcasts used by NFC." into nyc-dev