Merge "Replace ctl_default_prop access with explicit service property keys."