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

* commit '95cce9d57e627a86f612bf402b3338a6a1a1eae3':
  Avoid system server crash due to package removed