Merge "Fix install and update times for non-system packages."