Merge "Add support for NFC associated role services" into main