Merge "psh_utils: Optimize for no service conditions" into main