Merge "Fix system_weak_test 2: GSS"