Merge "Fix a number of multi-user bugs." into cm-10.1

Change-Id: I2f8a34105f36d37d15e95cb93d8baeec9ab29bd8