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

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