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

Change-Id: I4e8efe840421a0a5f74d3b115d641e6130e39ae9