Merge changes I72e979ce,I183b8a48

* changes:
  Add @IntDef for status of committed rollback.
  Use test stubs for RollbackTests, not system stubs.