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

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