Merge "Re-derive permissions after package changes."