Merge "Fix NullPointer Exception in testharness command"