B-58092 deduping DatastoreAction.java