Merge "Register Rollback user callbacks for added users" into qt-dev
am: 02756daecd

Change-Id: I179f757240a8776410085f64a00cdf59cb7c4969