Merge "Make switch user test measurements consistent with each other."