Merge "Fix the flaky gauge/value e2e test due to cached events." into pi-dev am: a159842161
am: 5ba80b011f

Change-Id: I5765a703cdd641d1d0d054a3b9697e558d133a51