Fix Service plan registration

[Fixes: #58993540]

Change-Id: I126b7d5a285dd65eab46aeb49ce1a68c60bc959b