Merge "Delete rows for ejected filesystem in a transaction" am: 4243228739
am: f85e0bb209

* commit 'f85e0bb209eb40aa97c4598c0d26a0a983dc2db8':
  Delete rows for ejected filesystem in a transaction