Merge "Re-derive permissions after package changes." am: db72fe1772
am: e0e5922ec5

* commit 'e0e5922ec5ffe3172c64f1bc23fb9a56c7ef0319':
  Re-derive permissions after package changes.