Merge "Recover from missing upgrade to system package." into lmp-dev