Merge "Remove package on which we cannot revert."
am: f0b308bdba

* commit 'f0b308bdba546081d64d1e593395f8957b3a2e89':
  Remove package on which we cannot revert.