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

Change-Id: I3942b5c691b31054ca63b3bbd7fc89ec269c9e28