Fix multi-user issues.

Change-Id: I44d190f60e87326ab3282c898d94ecc88778f2ab