LPS-35502 properly deprecate APIs from 6.1
LPS-35502 regen svcs