[automerger skipped] Merge "Fix rollbacks in multi-user case." into qt-dev am: fb1a20e4
am: 70bf1bcd -s ours
am skip reason: change_id I1a7cf101b3bc3575421629c4bf0ff63418eb8731 with SHA1 d81ff978 is in history
Change-Id: I0fa94ab5297cdab7a5e978824c42e276afb79c5c