prop224: Fix coverity reports generated by prop224 service merge (#20657)