[IOT-1538] Add support for Protocol-Independent ID