Merge changes I887e587a,Id117b6d6

* changes:
  Replace NewRollback with Rollback (5/n)
  Move mNumPackageSessionsWithSuccess into Rollback (4/n)