Merge "Add onServiceNameDiscovered/onServiceNameRemoved"