Merge "Hold package cleaning until system is ready." into lmp-dev