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

Change-Id: I307ae40dea86ac56304af212c48c586285151efd