am 93d47b4c: Merge "Avoid system server crash due to package removed" into lmp-mr1-dev

* commit '93d47b4c05585c37117ac5ac44d810de63f9d008':
  Avoid system server crash due to package removed