Merge "Use mock instead of relying on command stderr"