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

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