Merge "Avoid system server crash due to package removed" into lmp-mr1-dev