am 4c880877: Merge "Recover from missing upgrade to system package." into lmp-dev

* commit '4c88087776305f54bec0aae59b8e63bc803c1401':
  Recover from missing upgrade to system package.