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

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