Merge "Fix system_weak_test"