Merge "API cleanup: add NonNull annotation to Rollback API"