Merge "Fix the flaky test that use wrong context"