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

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