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

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