Merge "Fix the flaky gauge/value e2e test due to cached events." into pi-dev