bug: Safely handle concurrent transactions on server Change-Id: If8d01884dae0eb5b93e6c82461179ff399aeba79