Replace NewRollback with Rollback (5/n) Bug: 147400979 Test: atest RollbackTest Change-Id: I887e587aad9705b7a0e868f09f320b49eb589049