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

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