Eng 6857

You can check `proc.getSystemproc()` first so that user proc invocations don't have to do a string comparison every time.