am 5d16ac5e: Merge change 3374 into donut

Merge commit '5d16ac5eb6c4a468cabc39bdd00eac1759993db5'

* commit '5d16ac5eb6c4a468cabc39bdd00eac1759993db5':
  Fix tracking of backup participants across package remove/update